Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

components/webui/client/src/pages/SearchPage/SearchState/useUpdateStateWithMetadata.ts (1)

16-17: Docstring now aligns with enum (FAILED) — resolved

Thanks for updating the comment to use “FAILED”; this addresses the earlier review concern.

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

components/webui/client/src/pages/SearchPage/SearchControls/Presto/presto-search-requests.ts (2)

71-73: Prevent UI from getting stuck on QUERY_ID_PENDING and surface the error to users

If submitQuery rejects (e.g., no queryId ever produced), the UI remains at QUERY_ID_PENDING and users see no notification. Set UI to FAILED and emit a notification in the catch handler.

Apply this diff:

-        .catch((err: unknown) => {
-            console.error("Failed to submit query:", err);
-        });
+        .catch((err: unknown) => {
+            updateSearchUiState(SEARCH_UI_STATE.FAILED);
+            console.error("Failed to submit query:", err);
+            const e: any = err as any;
+            const errorName: string | null =
+                ("string" === typeof e?.errorName)
+                    ? e.errorName
+                    : (("string" === typeof e?.name) ? e.name : null);
+            const errorMsg: string =
+                ("string" === typeof e?.errorMsg)
+                    ? e.errorMsg
+                    : (e?.message ? String(e.message) : "Presto query failed");
+            notification.error({
+                message: errorName ?? "Presto query failed",
+                description: errorMsg,
+            });
+        });

Add the import (outside the selected range):

// at top-level imports
import {notification} from "antd";

---

23-27: Avoid noisy error logs when there is no prior job to clear

When a previous submission failed before a jobId existed, clearing results is a no-op. Downgrade the log level or silently return to reduce noise.

Apply this diff:

-    if (null === searchJobId) {
-        console.error("Cannot clear results: searchJobId is not set.");
-
-        return;
-    }
+    if (null === searchJobId) {
+        console.debug("No results to clear: searchJobId is not set.");
+        return;
+    }

components/webui/server/src/routes/api/presto-search/index.ts (1)

166-169: Return a structured 500 with errorName/errorMsg when failure occurs before state

Currently the handler rethrows, producing a generic 500. Return a body matching ErrorSchema so the client can display a meaningful notification even when no metadata doc exists.

Apply this diff:

-            } catch (error) {
-                request.log.error(error, "Failed to submit Presto query");
-                throw error;
-            }
+            } catch (error) {
+                request.log.error(error, "Failed to submit Presto query");
+                const e: any = error as any;
+                const errorName: string | null =
+                    ("string" === typeof e?.errorName)
+                        ? e.errorName
+                        : (("string" === typeof e?.name) ? e.name : null);
+                const errorMsg: string =
+                    ("string" === typeof e?.errorMsg)
+                        ? e.errorMsg
+                        : (e?.message ? String(e.message) : "Presto search failed");
+                reply.code(StatusCodes.INTERNAL_SERVER_ERROR);
+                return reply.send({errorName, errorMsg});
+            }

components/webui/server/src/routes/api/presto-search/index.ts (2)

130-135: Validate incoming state before casting to enum

Defensively guard against unexpected strings to avoid persisting invalid states.

Apply this diff:

-                            // Type cast `presto-client` string literal type to our enum type.
-                            const newState = stats.state as PRESTO_SEARCH_SIGNAL;
+                            // Validate then cast `presto-client` state to our enum type.
+                            if (false === Object.values(PRESTO_SEARCH_SIGNAL)
+                                .includes(stats.state as PRESTO_SEARCH_SIGNAL)) {
+                                request.log.warn({state: stats.state}, "Unknown Presto state; skipping metadata update");
+                                return;
+                            }
+                            const newState = stats.state as PRESTO_SEARCH_SIGNAL;

---

109-120: Upsert error metadata and derive a robust errorName fallback

Without upsert, failures that occur before the first state insert will not persist error metadata; clients won’t be notified. Also prefer engine-provided errorName, then standard Error.name.

Apply this diff:

-                                searchResultsMetadataCollection.updateOne(
-                                    {_id: searchJobId},
-                                    {
-                                        $set: {
-                                            errorMsg: error.message,
-                                            errorName: ("errorName" in error) ?
-                                                error.errorName :
-                                                null,
-                                            lastSignal: PRESTO_SEARCH_SIGNAL.FAILED,
-                                        },
-                                    }
-                                ).catch((err: unknown) => {
+                                searchResultsMetadataCollection.updateOne(
+                                    {_id: searchJobId},
+                                    {
+                                        $set: {
+                                            errorMsg: error.message,
+                                            errorName:
+                                                ("string" === typeof (error as any)?.errorName)
+                                                    ? (error as any).errorName
+                                                    : (("string" === typeof (error as any)?.name)
+                                                        ? (error as any).name
+                                                        : null),
+                                            lastSignal: PRESTO_SEARCH_SIGNAL.FAILED,
+                                        },
+                                    },
+                                    {upsert: true}
+                                ).catch((err: unknown) => {

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro